From eb67607b756ed33e7f2277247d59519f0593f465 Mon Sep 17 00:00:00 2001 From: "sos22@labyrinth.cl.cam.ac.uk" Date: Tue, 8 Jul 2003 15:06:41 +0000 Subject: [PATCH] bitkeeper revision 1.306 (3f0ade01zzZKmrmswpUSMGtDKNYM-A) Finish merginf with Keir. --- .../arch/xeno/drivers/dom0/dom0_core.c | 6 +++--- .../arch/xeno/drivers/dom0/dom0_memory.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c index c7992095cc..adfc9600ba 100644 --- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c @@ -46,7 +46,7 @@ static struct proc_dir_entry *dom0_cmd_intf; static struct proc_dir_entry *dom_list_intf; unsigned long direct_mmap(unsigned long, unsigned long, pgprot_t, int); -int direct_unmap(unsigned long, unsigned long); +int direct_unmap(struct mm_struct *, unsigned long, unsigned long); static ssize_t dom_usage_read(struct file * file, char * buff, size_t size, loff_t * off) { @@ -339,8 +339,8 @@ static int handle_dom0_cmd_unmapdommem(unsigned long data) if (copy_from_user(&argbuf, (void *)data, sizeof(argbuf))) return -EFAULT; - return direct_disc_unmap(argbuf.vaddr, argbuf.start_pfn, - argbuf.tot_pages); + return direct_unmap(current->mm, argbuf.vaddr, + argbuf.tot_pages << PAGE_SIZE); } static int dom0_cmd_ioctl(struct inode *inode, struct file *file, diff --git a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c index bdc2eb05a4..9d3a06491a 100644 --- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c @@ -85,7 +85,7 @@ static inline int direct_remappmd_range(struct mm_struct *mm, pmd_t * pmd, unsig } /* Note: this is only safe if the mm semaphore is held when called. */ -int direct_remap_page_range(unsigned long from, unsigned long phys_addr, unsigned long size, pgprot_t prot) +static int direct_remap_page_range(unsigned long from, unsigned long phys_addr, unsigned long size, pgprot_t prot) { int error = 0; pgd_t * dir; @@ -120,8 +120,8 @@ int direct_remap_page_range(unsigned long from, unsigned long phys_addr, unsigne * used for remapping discontiguous bits of domain's memory, pages to map are * found from frame table beginning at the given first_pg index */ -int direct_remap_disc_page_range(unsigned long from, - unsigned long first_pg, int tot_pages, pgprot_t prot) +static int direct_remap_disc_page_range(unsigned long from, + unsigned long first_pg, int tot_pages, pgprot_t prot) { dom0_op_t dom0_op; unsigned long *pfns = (unsigned long *)get_free_page(GFP_KERNEL); @@ -265,7 +265,7 @@ static inline int direct_zap_pmd_range(mmu_gather_t *tlb, pgd_t * dir, /* * remove user pages in a given range. */ -void direct_zap_page_range(struct mm_struct *mm, unsigned long address, unsigned long size) +static void direct_zap_page_range(struct mm_struct *mm, unsigned long address, unsigned long size) { mmu_gather_t *tlb; pgd_t * dir; -- 2.30.2